Fun automake fixins

-Yosh

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 306e617047b2edbab664c4d5ce38f49a06ace12e..841cf9aeb754a3671a730fecb3dcf5266f43b347 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -13,20 +13,17 @@ libexec_LTLIBRARIES =               \
 
 noinst_PROGRAMS = testpixbuf
 DEPS = libgdk_pixbuf.la
-INCS = $(GNOME_INCLUDEDIR)
-DEFS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
+INCLUDES = $(GNOME_INCLUDEDIR)
+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
 LDADDS = libgdk_pixbuf.la @GNOME_LIBDIR@ @GNOMEUI_LIBS@
 
 testpixbuf_DEPENDENCIES = $(DEPS)
 testpixbuf_LDADD = $(LDADDS)
-testpixbuf_INCLUDES = $(INCS)
-testpixbuf_CFLAGS = $(GNOME_INCLUDEDIR) $(DEFS)
 
 #
 # The GdkPixBuf library
 #
 libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
-libgdk_pixbuf_CFLAGS = $(GNOME_INCLUDEDIR) -I$(top_builddir) -I$(top_srcdir)
 
 libgdk_pixbuf_la_SOURCES =     \
        gdk-pixbuf.c            \
@@ -39,32 +36,32 @@ libgdk_pixbufinclude_HEADERS =      \
 # The PNG plugin.
 #
 libpixbuf_png_la_SOURCES = io-png.c
-libpixbuf_png_la_LDFLAGS = -avoid-version
+libpixbuf_png_la_LDFLAGS = -avoid-version -module
 libpixbuf_png_la_LIBADD = $(LIBPNG)
 
 #
 # The JPEG loader
 #
 libpixbuf_jpeg_la_SOURCES = io-jpeg.c
-libpixbuf_jpeg_la_LDFLAGS = -avoid-version
+libpixbuf_jpeg_la_LDFLAGS = -avoid-version -module
 libpixbuf_jpeg_la_LIBADD = $(LIBJPEG)
 
 #
 # The XPM loader
 #
 libpixbuf_xpm_la_SOURCES = io-xpm.c
-libpixbuf_xpm_la_LDFLAGS = -avoid-version
+libpixbuf_xpm_la_LDFLAGS = -avoid-version -module
 
 #
 # The GIF loader
 #
 libpixbuf_gif_la_SOURCES = io-gif.c
-libpixbuf_gif_la_LDFLAGS = -avoid-version
+libpixbuf_gif_la_LDFLAGS = -avoid-version -module
 libpixbuf_gif_la_LIBADD = $(LIBGIF)
 
 #
 # The TIFF loader
 #
 libpixbuf_tiff_la_SOURCES = io-tiff.c
-libpixbuf_tiff_la_LDFLAGS = -avoid-version
+libpixbuf_tiff_la_LDFLAGS = -avoid-version -module
 libpixbuf_tiff_la_LIBADD = $(LIBTIFF)